minor changes before possible query overhaul
changed default query size
fixed some exceptions issues