cleanup, added filter question by keyword