Alter Query for fix