Moved queries from Mapper to Repository and use parameters instead of string for SQL
- fixes #4