removed legacy
fixed search method merge conflict in stones' controller