Keyword support, sys log, system log changes

Don't we need to separate limit for other queries.