Case insensitive search
Fixing issues