Add possibility to search for uppercased environment variable
Add dash conversion to underscore