fixes for dynamic url naming