Added limit to prevent getting too much data from database