simplify SQL
Fix method result