Null safety
Move stored queries from the type list to separately configurable items