some more trimming adding case unsensitive