#112 - Refactored articles query