Removed eval from abstract query
Making the code climate a bit nice