code cleanup & bugs
improve no quotes found page