Added ability to sort by keyword