fixed zone issue. also added in queue finding logic