more fixes for motto filler