Change to end block of define SEARCHTERMS in ConnectionHandler.cpp
and removal of exceptionregexpheaderlist from FOptionContainer