[untested] Added support for diamond blastx replacement and bugfixes for singleton extraction support