Finished support for reverse and strand in a single search, merging with main branch and starting testing