Redirect bug fixed and store_location filter enhancements