Add QuerySelect and QuerySelectList fields