* Implement model specific lookups by id to improve performance
* Address comments e.g. better variable names and test cleanup
* commit after cleanup
* even better name and test cleanup via rollback
Co-authored-by: Bogdan Kyryliuk <bogdankyryliuk@dropbox.com>