cleanup inputhandler and resultlist, fixed testQ query