Added QUERY and consolidated serverside lock check methods