changed default SQL statments to be more specific