Added limit restriction on DB retrieval (fixes #2)