Bugs found with NL Parser, improved keywords search