Update readme and refactor search