Fixed Q/textfill refactoring