Add features search and related implementation. Need to build test