Headers are now correctly included in searches. Closes #207