Implemented GJP-20 Feature search

Created by David, rebased