[UPDATE] Refined search and create methods for Entry Module