Minor fixes & adding 'Group' to search results table