Remove article content type hardcoding in queries