Fixes for Thruways and EP site