Adjusted front matter and query