Merge pull request #1106 from timw4mail/develop

Limit db session to select 1 row