Removing encoding check from location, adding to command