Added max track count and addressed duplicate request issue