Implemented First Query-Match Render