Improved categorisation of SQL queries so we better separate out OTHER
types