Change subject map to search for a subject. Refactor common into maps.js