Ashwin | #2868 | Changes to subject autocomplete view