Move of lookups from page to controller