Limit query to single row
Merge tag '0.6.3'