Added system profile filtering