Shortlist feature halfway done. Fixed issue #4