Merge pull request #30 from perselab/master

Store search
improve warehouse