Merge "bugfix: query doesn't work well with period=1"