do not user merge to handle scopes
fix failing tests
delete commented out lines
split long line
take care of STI for scoping

take care of STI by getting the where values and adding it to
the returned relation