Change enum-based UI components to be backed by custom query-based data models