Added exception for question words