Added abilities and tidied up Room search/sort