free drop queries and make into clause optional