Switches Class Flags to default search fields

(and fixes #1264)