basic fix for Upper/Lower cases. All converted to lower case. Need to add proper fix.