Resovle issues when using First/Single/Any/Count on mapped queries.