[Fix] Handling of blocks in some cases
[Improvement] Element type handling when limiting results to current language
[Fix] Issue where results were not limited to the current language in some cases
