remove test_trash and unused variables in query (name and use_xhtml_strict) and add Stefanos suggetions for #588 in the action-string.
remove test_trash and unused variables in query (name and use_xhtml_strict) and add Stefanos suggetions for #588 in the action-string.